Changes to the 020 and 030 Public and Charter Layout