Updated to 800x600. Some magic numbers removed