Midway through refactoring start menu