Added some more UI features