CombatListActivity refactor and other refactors