fixing Form flickering and BattleManager