Fixed GUI

Big help from Alex_hawks and Wiebbe