Fixed height of location to prevent logo from jumping
Merge branch 'master' into gms.com