Styling and organization updates