Edited some classes to work with the new UserInterface-class