Refactor Naval Battle View