minor clean up and ui tweaks