pre merge for .home, nav corrections
merging yet again some stuff
merging yet again some stuff