CMake changes for better compiler flags
GUI changes -- added menus to states