Some functional/ UI changes. No more Next and Previous button.