Revised design and layout