Add DP and SP units to calculator, tweak calculator margins