Made some UI changes