WIP - small improvements, but the history is currently disabled when scrolling