Revised enclosure layout and markings