Some refactors
Merge pull request #6 from juansanzone/develop

updateLocationActionButton and Some refactors