UI update and bugfixes