skip logic bug as well as next and previous button occlusion