Merge pull request #90 from jkuk/master

asd
Full GUI Update
Merge pull request #91 from WannabeSid/master

GUI Update
if branches in event manager to handle things