Change display of locations
Merge branch 'develop'