Made GUI work
Merge branch 'GUI'