correct position and clean up control bar logic [Finishes #78839758]