Major updates

Updated previous and next loading