update some gui shit
merge with master