Added MakeMenu class

This should clean up the Main class a little