Finished styling appointments page and changed other pages to match style
Fixed a query error in when the user was a patient or staff
Fixing merge conflicts