wip gui updates
Merge in latest to controls branch
Added controls to ui