Add Next and Previous Button and re-code a bit