MainMenu added, beginning code refactoring