updated UI-class to work with the updated App-class