Styling and other fixes