Fix time-bar and other bugs