Fix 'View Location' button
Merge branch 'master' of github.com:hans/gilbert-cleanup