Basic location correction [PD-745]

I'm currently working on making tests pass, but it's a test issue, not a view issue.
And this