CombatGUI worked on, some changes to other GUI classes