More styling changes to patient lookup and info pages
Fixing merge conflicts