refactored locations controllers + additions to alliances views