Added navbar and fixed css includes