UI feedback
UI and bugfixes