Added some TODOs
Added next and previous buttons