Clean up

Cleaned up CombatFragment's displaying and hiding by adding it to the
more modular PopUpScreenActivity.