Minor bug fixes and layout changes for suggestions