Add location and fix various display requirements
Merged