Finessing

Nav, map, settings updated
Maps and directives