Reviews

Working on #64 #65 and #66 
I was completely ignoring any issues with the navbar because we have #60 coming up which I assumed would deal with these issues