Updated styling and layout