Revert "Maintain states during Previous and Next clicks"

This reverts commit 8b566e4a8c58575e8e59775ef57a615b5049a2b2.