main menu implementation and git upstream issues fixed