bug fixes and styling