Feature/zen 14022

ZEN-14017 Allow for larger categories and make sure the user can scroll if there are too many