Changed the design and layout