Styling fixes
Further Styling Fixes