Added some more UI components