Updated scrolling to support UP and DOWN as well