Revert "Revert "TRUNK-2888 - Further improvements to the patient dashboa...

Reverts openmrs/openmrs-core#1143