Enable and Disable rectified for School and A little rectification of the headers