Results maps

Also includes a tweak to property view.