Major fixes for displaying of time