Merge "UI changes in suggestion menu"