fixes and styling