GUI improved/fixed