Merged updates from desktop in Passport config, router, and dashboard functions
Final Commit
Final commit