Refactored constants, renamed menu xml file