Made some UI modifications