edited navbar and tmatrix