Fixed new location views
Merge pull request #2386 from ten24/feature-4-initialTabFixes

Fixed new location views