UI update

some fixes included