Fix next/back buttons, closes #9