Lots of progress on game, small layout bugs fixed