added navbar and cleaned comments