Clean up image upload button fakage, default field ordering to database order