UI changes and time formatting fix