Clean up control bar and fix time slider issue [Finishes #79383774]