some gui stuff changed

better merge now than later