Styling changes.  Also fixing locations problem with a hack to get the office city name.