GUI modifications
Better property validation