working on next/prev helpers handling and design