minor clean up and ui tweaks
refactor and cleanup