Added changes to the maingui
Merge branch 'dev' of https://github.com/Castronova/EMIT into dev