Imporved GUI