updated style and layout