ADDED & FIXED : Button added and trash code eliminated

- Previous / Next button change
- Unneccesary code discard