Change GUI class architecture