fixed both guis
merge conflicts
Merge conflicts 2