GUI improved