Added more to the navbar and fixed a few bugs