Refactored model, added user location to UI.