fixing navigation for cust
Merge origin/master