Add Styling and clean up layout.