LaMeeryout fixes and Nav fixes
Merge branch 'master' of https://github.com/tincann/potje