cleanup, started on prev/next button actions