Adding _cxx.cpp to the build
Refactoring menu implementation. Not using compile-time tricks
Cleanup