Removed page/scroll option until it's been troubleshat
Various improvements to cover performance and interaction