Bug fixes on live server
Fix some bugs with time display