Change GUI to support master server