Added 'back' and 'next' buttons
Merge branch 'ui-design'