Styling and minor changes