Merged changes with Shivani. (Added observation menu along with healthfriends menu)