Refactor main menu

Closes #19