Added missing EvenSystems, removed unnecessary UI code