Cleanup
Implemented the skip active page feature