Add old scroll logic back in, cleanup, fixes
Add option top_align_on_move