Added some UI improvements