Added button and activity fixing for location screen