* Added dynamic nav menu
* Added additional security for token lookups