Gui almost working
Merged changes