Tidied up PatientViewer UI  as per assigned GitHub Issue.