Styling and Fixes