GUI is slightly changed