Updated base and layout styles