Bug Fix: Location Button