FF Fix: code cell missing hscroll (2)

Work in progress...

Addresses #4986 and #5050 and removes #4986.