Update with GUI and linking