top bar changed and ui cleanup
merge conflicts resolved