Add Location loader and minor tweaks across all pages