Complete GUI, little changes