Small bug fixes and ui tweaks
code cleanup