Fixed toolbar problem in LocationController