Update UserGUI
Merge pull request #36 from Bergsocke/developer

Update UserGUI