fixing schema layout