Added some more options and reorganized the X UI.