updated GUI and it's logic
upload modlogic
Merge remote-tracking branch 'origin/master'