Merge branch 'case-2788' into new-search

* case-2788:
  Case 2788 - Added new show more/less buttons.
Merge branch 'new-search' into case-2788

* new-search:
Case 2788 - Fixed button colors.