Added some UI features