Dianas commit 4 UI edit