Standardize class names, move zoom, and chnage number field tovarchar