More changes to Login/Map/CacheView