Modified the way the location tile works

Change-Id: I3c7c51c8d7e3a8c003c37d1b55a6503a9bbeaf64