fixed some navigation problems
some layout changes