Gui tweaks and bug fixes

Added logic supporting moving into and out of manual override