Updated structure and layout