Small categories display fixes
Merge