Added some user interface stuff