Updated to fix css class bug, plus new widget value formatting