Merge new design with GUI