Added some navigation buttons - They need to be cleaned up a bit though