Added navbar and added conventional words