more gui stuff
another merge