styling and fixes
Styling and fixes