Added navbar and fixed bugs