Added some UI stuff