Refactored out the location listening code
Refactored UI Code