Part of #102 - buttons fix.

"Next"/"previous" buttons did not work.