Full UI control

Moved all UI into ControlBar
Implemented color picker funcitonality