Revert "Control buttons and previous/next buttons fixed"

This reverts commit 80f383d79e5bb1942e8b9607c1693597df9b94fb.