GUI2 improved