Refactored view-location.html