sorted out the scrolling
Various bits of reorg around routing