More bug fixes and styling
Styles