some gui changes too