Merge "Update suggestion card layout"