Fix bugs relating to change in screen size. Add two new map files for testing.