Add main menu; close #2