Adding scrolling to reduce jumpiness (not perfect but a start)