diff --git a/frontend/src/components/CompanyForm.js b/frontend/src/components/CompanyForm.js
index de6a7ab..eb0190a 100644
--- a/frontend/src/components/CompanyForm.js
+++ b/frontend/src/components/CompanyForm.js
@@ -37,16 +37,16 @@
             {error && <div className="alert alert-danger">{error}</div>}
             <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' name='txtName'/>                    
+                    <label className='form-label' htmlFor='company-name'>Name:</label>
+                    <input id='company-name' 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:</label>
-                    <input value={form.website} onChange={e => setForm({...form, website:e.target.value})} className='form-control' />                    
+                    <label className='form-label' htmlFor='company-website'>Website:</label>
+                    <input id='company-website' value={form.website} onChange={e => setForm({...form, website:e.target.value})} className='form-control' />                    
                 </div>
                 <div className='mb-3'>
-                    <label className='form-label'>Notes:</label>
-                        <textarea value={form.notes} onChange={e => setForm({...form, notes:e.target.value})} className='form-control'/>                    
+                    <label className='form-label' htmlFor='company-notes'>Notes:</label>
+                        <textarea id='company-notes' 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 fbb6136..843d3d6 100644
--- a/frontend/src/components/JobForm.js
+++ b/frontend/src/components/JobForm.js
@@ -1,34 +1,38 @@
-import React, {useEffect, useState} from "react";
+import React, { useEffect, useState } from "react";
 import { useParams, useNavigate } from "react-router-dom";
-import {apiGet, apiPost, apiPut} from "../api";
+import { apiGet, apiPost, apiPut } from "../api";
 
-const STATUSES = ["INTERESTED","APPLIED", "PHONE_SCREEN", "TECH_INTERVIEW", "OFFER", "REJECTED", "WITHDRAWN"];
+const STATUSES = ["INTERESTED", "APPLIED", "PHONE_SCREEN", "TECH_INTERVIEW", "OFFER", "REJECTED", "WITHDRAWN"];
 
 export default function JobForm() {
-   const {id} = useParams();
-   const navigate = useNavigate();
-   const isEdit=Boolean(id);
-   const today = new Date().toISOString().split("T")[0];
+  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:today,
-    jobUrl:"",
-    status:"INTERESTED",
-    location:"",
-    source:"",
-    salaryExpectation:"",
-    notes:""
-   });
-   const [error, setError]=useState(null);
+  const [companies, setCompanies] = useState([]);
+  const [form, setForm] = useState({
+    companyId: "",
+    role: "",
+    appliedDate: today,
+    jobUrl: "",
+    status: "INTERESTED",
+    location: "",
+    source: "",
+    salaryExpectation: "",
+    notes: ""
+  });
+  const [error, setError] = useState(null);
 
-   useEffect(() => {
-      // Fetch companies for the dropdown
-      apiGet('/api/companies')
-         .then(setCompanies)
-            .catch(error => setError(error.message));
-       if (isEdit) {
+  const handleChange = (field) => (e) => setForm({ ...form, [field]: e.target.value });
+
+  useEffect(() => {
+    // Fetch companies for the dropdown
+    apiGet('/api/companies')
+      .then(setCompanies)
+      .catch(error => setError(error.message));
+
+    if (isEdit) {
       apiGet(`/api/jobs/${id}`)
         .then(data => {
           setForm({
@@ -47,11 +51,11 @@
     }
   }, [id, isEdit]);
 
-   async function onSubmit(e) {
+  async function onSubmit(e) {
     e.preventDefault();
     setError(null);
 
-    // backend expects payload to include company object (id) or companyId depending on implementation.
+    // Backend expects payload to include company object (id) or companyId depending on implementation.
     // Here we send company as { id: companyId } because our sample backend used that previously.
     const payload = {
       role: form.role,
@@ -83,78 +87,102 @@
       {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</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>
-        </div>
+          {/* Left column */}
+          <div className="col-md-6">
+            <div className="mb-3">
+              <label className="form-label">Company</label>
+              <select
+                required
+                value={form.companyId}
+                onChange={handleChange('companyId')}
+                className="form-select"
+              >
+                <option value="">Select company</option>
+                {companies.map(c => <option key={c.id} value={c.id}>{c.name}</option>)}
+              </select>
+            </div>
 
-        <div className="mb-3">
-          <label className="form-label">Role</label>
-            <input required value={form.role} 
-            onChange={e => setForm({...form, role: e.target.value})}
-            className="form-control" />
-        </div>
+            <div className="mb-3">
+              <label className="form-label">Role</label>
+              <input
+                required
+                value={form.role}
+                onChange={handleChange('role')}
+                className="form-control"
+              />
+            </div>
 
-        <div className="mb-3">
-          <label className="form-label">Applied date</label>
-            <input type="date" value={form.appliedDate} 
-            onChange={e => setForm({...form, appliedDate: e.target.value})} 
-            className="form-control"/>
-        </div>
+            <div className="mb-3">
+              <label className="form-label">Applied date</label>
+              <input
+                type="date"
+                value={form.appliedDate}
+                onChange={handleChange('appliedDate')}
+                className="form-control"
+              />
+            </div>
 
-        <div className="mb-3">
-          <label className="form-label">Job URL</label>
-            <input value={form.jobUrl} 
-            onChange={e => setForm({...form, jobUrl: e.target.value})}
-            className="form-control" />
-        </div>
+            <div className="mb-3">
+              <label className="form-label">Job URL</label>
+              <input
+                value={form.jobUrl}
+                onChange={handleChange('jobUrl')}
+                className="form-control"
+              />
+            </div>
 
-        <div className="mb-3">
-          <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">Status</label>
+              <select
+                value={form.status}
+                onChange={handleChange('status')}
+                className="form-select"
+              >
+                {STATUSES.map(s => <option key={s} value={s}>{s}</option>)}
+              </select>
+            </div>
+          </div>
 
-        <div className="mb-3">
-          <label className="form-label">Location</label>
-            <input value={form.location} onChange={e => setForm({...form, location: e.target.value})} 
-            className="form-control"/>
-        </div>
+          {/* Right column */}
+          <div className="col-md-6">
+            <div className="mb-3">
+              <label className="form-label">Location</label>
+              <input
+                value={form.location}
+                onChange={handleChange('location')}
+                className="form-control"
+              />
+            </div>
 
-        <div className="mb-3">
-          <label className="form-label">Source</label>
-            <input value={form.source} 
-            onChange={e => setForm({...form, source: e.target.value})}
-            className="form-control" />          
-        </div>
+            <div className="mb-3">
+              <label className="form-label">Source</label>
+              <input
+                value={form.source}
+                onChange={handleChange('source')}
+                className="form-control"
+              />
+            </div>
 
-        <div className="mb-3">
-          <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"/>
-        </div>
+            <div className="mb-3">
+              <label className="form-label">Salary expectation (per annum, €)</label>
+              <input
+                type="number"
+                value={form.salaryExpectation}
+                onChange={handleChange('salaryExpectation')}
+                className="form-control"
+              />
+            </div>
 
-        <div className="mb-3">
-          <label className="form-label">Notes</label>
-            <textarea value={form.notes} 
-            onChange={e => setForm({...form, notes: e.target.value})} 
-            className="form-control"
-            rows={5}/>
-        </div>
-        </div>
+            <div className="mb-3">
+              <label className="form-label">Notes</label>
+              <textarea
+                value={form.notes}
+                onChange={handleChange('notes')}
+                className="form-control"
+                rows={5}
+              />
+            </div>
+          </div>
         </div>
 
         <div className="d-flex gap-2">
diff --git a/src/main/java/com/kpaudel/JobTrackerApplication.java b/src/main/java/com/kpaudel/JobTrackerApplication.java
index 7b6ce49..12acb76 100644
--- a/src/main/java/com/kpaudel/JobTrackerApplication.java
+++ b/src/main/java/com/kpaudel/JobTrackerApplication.java
@@ -24,16 +24,6 @@
 
     @Override
     public void run(String... args) throws Exception {
-        if(compRepo.count()==0){
-            Company openai=this.compRepo.save(new Company(null,"OpenAI","https://test.com","notes"));
-            Company fb=this.compRepo.save(new Company(null,"Facebook","https://facebook.com","notes_facebook"));
-            Company amazon=this.compRepo.save(new Company(null,"Amazon","https://facebook.com","notes_facebook"));
-        }
-        //if(jobRepo.count()==0){
-        //    Company company=this.compRepo.getCompanyByName("OpenAI");
-        //    jobRepo.save(JobApplication.builder().company(company).location("Karlsruhe").build());
-            //jobRepo.save(JobApplication.builder().company(fb).location("Frankfurt").status(ApplicationStatus.APPLIED).build());
-            //jobRepo.save(JobApplication.builder().company(amazon).location("Berlin").status(ApplicationStatus.OFFER).build());
-        //}
+        System.out.println("Started...");
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 56df5e1..a94b6f0 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,4 +1,5 @@
 server.port=8088
 spring.datasource.url=jdbc:postgresql://192.168.1.253:5432/db_test
 spring.datasource.username=postgres
-spring.datasource.password=00977
\ No newline at end of file
+spring.datasource.password=00977
+spring.jpa.hibernate.ddl-auto=update
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index 286256e..b5c21d9 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -1,4 +1,6 @@
 server.port=8088
 spring.datasource.url=jdbc:postgresql://192.168.1.253:5432/job_tracker
 spring.datasource.username=jobuser
-spring.datasource.password=jobpass
\ No newline at end of file
+spring.datasource.password=jobpass
+
+spring.jpa.hibernate.ddl-auto=validate
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f50b268..31687be 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,7 +2,7 @@
 spring.mvc.pathmatch.matching-strategy=ant_path_matcher
 
 #JPA/HIBERNATE
-spring.jpa.hibernate.ddl-auto=create
+spring.jpa.hibernate.ddl-auto=validate
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
diff --git a/src/main/resources/db/migration/V2__update.sql b/src/main/resources/db/migration/V2__update.sql
index e69de29..20f664f 100644
--- a/src/main/resources/db/migration/V2__update.sql
+++ b/src/main/resources/db/migration/V2__update.sql
@@ -0,0 +1,48 @@
+-- Table: public.company
+
+-- DROP TABLE IF EXISTS public.company;
+
+CREATE TABLE IF NOT EXISTS public.company
+(
+    id uuid NOT NULL,
+    name character varying(255) COLLATE pg_catalog."default",
+    notes text COLLATE pg_catalog."default",
+    website character varying(255) COLLATE pg_catalog."default",
+    CONSTRAINT company_pkey PRIMARY KEY (id)
+)
+
+TABLESPACE pg_default;
+
+ALTER TABLE IF EXISTS public.company
+    OWNER to jobuser;
+
+-- Table: public.job_application
+
+-- DROP TABLE IF EXISTS public.job_application;
+
+CREATE TABLE IF NOT EXISTS public.job_application
+(
+    applied_date date,
+    last_updated timestamp(6) with time zone,
+    company_id uuid NOT NULL,
+    id uuid NOT NULL,
+    job_url character varying(255) COLLATE pg_catalog."default",
+    location character varying(255) COLLATE pg_catalog."default",
+    notes text COLLATE pg_catalog."default",
+    role character varying(255) COLLATE pg_catalog."default",
+    salary_expectation character varying(255) COLLATE pg_catalog."default",
+    source character varying(255) COLLATE pg_catalog."default",
+    status character varying(255) COLLATE pg_catalog."default" NOT NULL,
+    CONSTRAINT job_application_pkey PRIMARY KEY (id),
+    CONSTRAINT fkpk9sxfmuagscxttppfukwd2pq FOREIGN KEY (company_id)
+        REFERENCES public.company (id) MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE NO ACTION,
+    CONSTRAINT job_application_status_check CHECK (status::text = ANY (ARRAY['INTERESTED'::character varying, 'APPLIED'::character varying, 'PHONE_SCREEN'::character varying, 'TECH_INTERVIEW'::character varying, 'OFFER'::character varying, 'REJECTED'::character varying, 'WITHDRAWN'::character varying]::text[]))
+)
+
+TABLESPACE pg_default;
+
+ALTER TABLE IF EXISTS public.job_application
+    OWNER to jobuser;
+