Initial rework to enable vertical scrolling