#516 polish UI round 1 to match the wireframe
Merge branch 'UFT-516' of https://github.com/VHAINNOVATIONS/Mental-Health-eScreening into UFT-516