Moved controls to control bar.

No css or function changes, just shifted to bar.