added navbar for mobile
complete merge
merge with uichanges