Some ui tweaks and fixes