Improved battle stage layout.
Pulled changes to solve conflicts
Grrrarrrgghhh!