GUI has been improved