Many Styling fixes