Added some UI modifications