Did some UI changes