refactored Location activity, added listeners to Controller