Fixes

-Fixed garbage state when controller is disconnected
Cleanup menu