updated design and layout