fixed appointment bug
messages front end design
merged conflicts