Further refactoring

Separated buttons out, and main menu into separate classes.