refactor location views