Added some ui features