Bug fixes and styling