diff --git a/frontend/src/components/CompanyForm.js b/frontend/src/components/CompanyForm.js
index 1f7f487..de6a7ab 100644
--- a/frontend/src/components/CompanyForm.js
+++ b/frontend/src/components/CompanyForm.js
@@ -38,17 +38,15 @@
             <form onSubmit={onSubmit} className='mt-3'>
                 <div className='mb-3'>
                     <label className='form-label'>Name:</label>
-                    <input required value={form.name} onChange={e => setForm({...form, name:e.target.value})} className='form-control' />                    
+                    <input required value={form.name} onChange={e => setForm({...form, name:e.target.value})} className='form-control' name='txtName'/>                    
                 </div>
                 <div className='mb-3'>
-                    <label className='form-label'>Website:<br />
-                        <input value={form.website} onChange={e => setForm({...form, website:e.target.value})} />
-                    </label>
+                    <label className='form-label'>Website:</label>
+                    <input value={form.website} onChange={e => setForm({...form, website:e.target.value})} className='form-control' />                    
                 </div>
                 <div className='mb-3'>
-                    <label className='form-label'>Notes:<br />
-                        <textarea value={form.notes} onChange={e => setForm({...form, notes:e.target.value})} />
-                    </label>
+                    <label className='form-label'>Notes:</label>
+                        <textarea value={form.notes} onChange={e => setForm({...form, notes:e.target.value})} className='form-control'/>                    
                 </div>
                 <div className='d-flex gap-2'>
                     <button type="submit" className='btn btn-success'>
diff --git a/frontend/src/components/JobForm.js b/frontend/src/components/JobForm.js
index fb5fdb0..fbb6136 100644
--- a/frontend/src/components/JobForm.js
+++ b/frontend/src/components/JobForm.js
@@ -8,11 +8,12 @@
    const {id} = useParams();
    const navigate = useNavigate();
    const isEdit=Boolean(id);
+   const today = new Date().toISOString().split("T")[0];
 
    const [companies, setCompanies]=useState([]);
    const [form, setForm]=useState({
     companyId:"", 
-    role:"", appliedDate:"",
+    role:"", appliedDate:today,
     jobUrl:"",
     status:"INTERESTED",
     location:"",
@@ -81,79 +82,79 @@
       <h2>{isEdit ? "Edit job" : "New job"}</h2>
       {error && <div className="alert alert-danger">{error}</div>}
       <form onSubmit={onSubmit} className="mt-3">
+        <div className="row">
+        {/* Left column */}
+        <div className="col-md-6">
         <div className="mb-3">
-          <label className="form-label">Company<br />
+          <label className="form-label">Company</label>
             <select required value={form.companyId} 
             onChange={e => setForm({...form, companyId: e.target.value})}
             className="form-select">
               <option value="">Select company</option>
               {companies.map(c => <option key={c.id} value={c.id}>{c.name}</option>)}
             </select>
-          </label>
         </div>
 
         <div className="mb-3">
-          <label className="form-label">Role<br />
+          <label className="form-label">Role</label>
             <input required value={form.role} 
             onChange={e => setForm({...form, role: e.target.value})}
             className="form-control" />
-          </label>
         </div>
 
         <div className="mb-3">
-          <label className="form-label">Applied date<br />
+          <label className="form-label">Applied date</label>
             <input type="date" value={form.appliedDate} 
             onChange={e => setForm({...form, appliedDate: e.target.value})} 
             className="form-control"/>
-          </label>
         </div>
 
         <div className="mb-3">
-          <label className="form-label">Job URL<br />
+          <label className="form-label">Job URL</label>
             <input value={form.jobUrl} 
             onChange={e => setForm({...form, jobUrl: e.target.value})}
             className="form-control" />
-          </label>
         </div>
 
         <div className="mb-3">
-          <label className="form-label">Status<br />
-            <select value={form.status} onChange={e => setForm({...form, status: e.target.value})} className="form-select">
-              {STATUSES.map(s => <option key={s} value={s}>{s}</option>)}
-            </select>
-          </label>
+          <label className="form-label">Status</label>
+          <select value={form.status} onChange={e => setForm({...form, status: e.target.value})} className="form-select">
+            {STATUSES.map(s => (<option key={s} value={s}>{s}</option>))}
+          </select>          
         </div>
+        </div>        
+        
+        {/* Right column */}
+        <div className="col-md-6">
 
         <div className="mb-3">
-          <label className="form-label">Location<br />
+          <label className="form-label">Location</label>
             <input value={form.location} onChange={e => setForm({...form, location: e.target.value})} 
             className="form-control"/>
-          </label>
         </div>
 
         <div className="mb-3">
-          <label className="form-label">Source<br />
+          <label className="form-label">Source</label>
             <input value={form.source} 
             onChange={e => setForm({...form, source: e.target.value})}
-            className="form-control" />
-          </label>
+            className="form-control" />          
         </div>
 
         <div className="mb-3">
-          <label className="form-label">Salary expectation<br />
-            <input value={form.salaryExpectation} 
+          <label className="form-label">Salary expectation(per annum, €)</label>
+            <input type="number" value={form.salaryExpectation} 
             onChange={e => setForm({...form, salaryExpectation: e.target.value})} 
             className="form-control"/>
-          </label>
         </div>
 
         <div className="mb-3">
-          <label className="form-label">Notes<br />
+          <label className="form-label">Notes</label>
             <textarea value={form.notes} 
             onChange={e => setForm({...form, notes: e.target.value})} 
             className="form-control"
-            rows={4}/>
-          </label>
+            rows={5}/>
+        </div>
+        </div>
         </div>
 
         <div className="d-flex gap-2">