more ui tweaks and fixes