Add navbar and routing fixes

Cosmin Poieana requested to merge feature/uix into develop Mar 03, 2019