lots of changes for new layout and game balancing tweaks