more ui tweaks and bug fixes