More UI tweaks before major surgery