Rearrange location layout as per designs
Merge pull request #160 from noels/location_feature

Rearrange location layout as per designs