More paging improvements, moved spy settings to general
Merge pull request #381 from rashidkpc/master

More paging improvements, moved spy settings to general