Did some UI editing