better next prev with current item
bugfix
refactored da whoole thang