BZ-9754: formatted markup to mirror neCalculator - with some additions