Fix - Styling fixes