fixed both guis
merge conflicts