better gui not twice
apost cleaning
merge