rearrange some gui stuff