Work around for measure expectation calculation bug
Tweaked styling for patient builder