ui polish and bugfixes