Applied new design to laboratory. Removed some unnecessary stuff