Cleaned code up a bit

Gamescreens in code, no buttons yet.