small fixes in layout and formulas