Design and layout updated