Adjustments to UI (done with camilla)