Minor bug fixes and styling