Code style

Replace Map wih ImmutableMap
[PLAT-6145] Restore home page link to analytics
[PLAT-6145] Ensure code matches new alphabetical order