Added feature in doctor's panel and fixed some issues