Bugfixes in UI and Controller