UI cleanup and bugfixes