Tidying up
Fixed bug with navigation arrows