diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 27d8f00..2460866 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@drawable/hse"
+        android:icon="@drawable/hse_login"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/InjuryRecordForms/InjuryFormTwo.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/InjuryRecordForms/InjuryFormTwo.java
index 6882c08..28d3f98 100644
--- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/InjuryRecordForms/InjuryFormTwo.java
+++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/InjuryRecordForms/InjuryFormTwo.java
@@ -2,6 +2,7 @@ package com.utopiaindustries.hseobservationsapp.activities.InjuryRecordForms;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AutoCompleteTextView;
@@ -45,8 +46,8 @@ public class InjuryFormTwo extends AppCompatActivity {
     ImageView imgBack;
     private AutoCompleteTextView kpiTextview, incidentTypeTextview,
             injuryTypeTextview, personalIllnessTextview, bodyPartTextview, riskTypeTextview ;
-    String kpi = "";
-    String incidentType = "";
+    private String kpi = "";
+    private String incidentType = "";
     private ShiftAdapter shiftAdapter;
 
     private KpiAdapter kpiAdapter;
@@ -301,12 +302,12 @@ public class InjuryFormTwo extends AppCompatActivity {
         boolean returnValue = true;
         String message = "";
 
-        if (incidentType.isEmpty()) {
+        if (incidentType == null || incidentType.isEmpty()) {
             message = "Please select incident type.";
             returnValue = false;
         }
 
-        if (kpi.isEmpty()) {
+        if (kpi == null || kpi.isEmpty()) {
             message = "Please select KPI.";
             returnValue = false;
         }
diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ObservationForms/ObservationTwoActivity.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ObservationForms/ObservationTwoActivity.java
index 9e16902..998f67d 100644
--- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ObservationForms/ObservationTwoActivity.java
+++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/ObservationForms/ObservationTwoActivity.java
@@ -263,7 +263,7 @@ public class ObservationTwoActivity extends AppCompatActivity {
         }
 
         if (riskLevel.isEmpty()) {
-            message = "Please select Risk level description.";
+            message = "Please select Risk level.";
             returnValue = false;
         }
 
diff --git a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/PermitToWorkForms/PermitOneActivity.java b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/PermitToWorkForms/PermitOneActivity.java
index 40930da..51283ac 100644
--- a/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/PermitToWorkForms/PermitOneActivity.java
+++ b/app/src/main/java/com/utopiaindustries/hseobservationsapp/activities/PermitToWorkForms/PermitOneActivity.java
@@ -222,12 +222,17 @@ public class PermitOneActivity extends AppCompatActivity {
         boolean returnValue = true;
         String message = "";
 
-        if (workingParty.isEmpty()) {
+        if (workingParty == null || workingParty.isEmpty()) {
             message = "Please select Working Party.";
             returnValue = false;
         }
 
-        if (ptwType.isEmpty()) {
+        if (workingTeam == null || workingTeam.isEmpty()) {
+            message = "Please select working Team.";
+            returnValue = false;
+        }
+
+        if (ptwType == null || ptwType.isEmpty()) {
             message = "Please select ptw Type.";
             returnValue = false;
         }
diff --git a/app/src/main/res/drawable/hse_login.jpg b/app/src/main/res/drawable/hse_login.jpg
new file mode 100644
index 0000000..87cbe8f
Binary files /dev/null and b/app/src/main/res/drawable/hse_login.jpg differ
diff --git a/app/src/main/res/drawable/hse_login_edit.jpg b/app/src/main/res/drawable/hse_login_edit.jpg
new file mode 100644
index 0000000..b6f4de0
Binary files /dev/null and b/app/src/main/res/drawable/hse_login_edit.jpg differ
diff --git a/app/src/main/res/drawable/hse_logo.jpg b/app/src/main/res/drawable/hse_logo.jpg
new file mode 100644
index 0000000..0b25c89
Binary files /dev/null and b/app/src/main/res/drawable/hse_logo.jpg differ
diff --git a/app/src/main/res/layout/activity_injury_form_two.xml b/app/src/main/res/layout/activity_injury_form_two.xml
index d77ba3c..357722c 100644
--- a/app/src/main/res/layout/activity_injury_form_two.xml
+++ b/app/src/main/res/layout/activity_injury_form_two.xml
@@ -251,7 +251,7 @@
                 android:layout_marginTop="10dp"
                 android:gravity="left"
                 android:padding="5dp"
-                android:text="Risk Type "
+                android:text="Risk Level "
                 android:textColor="@color/black"
                 android:textSize="@dimen/_13sdp"
                 android:textStyle="bold" />
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index cc2a7e1..c45f696 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -14,7 +14,6 @@
         android:layout_marginStart="1dp"
         android:layout_marginTop="60dp"
         android:layout_marginEnd="1dp"
-        android:background="@color/grey_100"
         android:gravity="center"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
@@ -23,9 +22,9 @@
 
         <ImageView
             android:layout_width="150dp"
-            android:layout_height="100dp"
+            android:layout_height="150dp"
             android:layout_marginBottom="20dp"
-            android:src="@drawable/icon_hse" />
+            android:src="@drawable/hse_login" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 4c15ca0..6a25d9c 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -11,12 +11,12 @@
     <ImageView
         android:id="@+id/imageView"
         android:layout_width="300dp"
-        android:layout_height="180dp"
+        android:layout_height="250dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/hse" />
+        app:srcCompat="@drawable/hse_login" />
 
     <ImageView
         android:id="@+id/imageView3"