added nav bar + all formulas