Styling and small fix