navigation and ui changes
merge conflicts