Merged the two location pages