Bug fixes
Fixes and styling