Updated style and layout