ui enhancements
nav helper
ui update
fixing merge conficts