Updated UI and few changes on Data entry form