UI updates and date time fixing