Adjusted style and layout