Any site or building use permitted under a previous zoning district’s regulation shall conform to the regulations of this Ordinance under the current site and building design provisions determined to be most applicable to the non-conforming use by the Administrative Official.