Moved label in CombatWindow, other small updates - Kevin (kchen87)