Redo Doctor UI

Stupid github sync T____T