UI tests and bugfixes
UI tests and bugfixes