few changes
with GUI changes