Refactoring
add next/prev buttons