updateLocationActionButton and Some refactors