Fixed Office/City Ref and Created Office Controller/Views