Updated Main GUI
Changes
Merged With Master
Merge remote-tracking branch 'upstream/master'