Implement new battle view
Refactor
Merge Test
Merge test2
Merge test2