Improved view of acquired locations

Also corrected a couple of bugs