Issue798: Code includes horizontal scroll