Added some more GUI functionality