Nav helper, layout &  menu fixes