Improve smart page switching
Rearrange
ActiveJob style workers