Main class tidying and room menu

Just did some more tidy up of the main class and then started working on
the room menu