navbar shit
conflict with scripts resolved