cleanup and better global nav