Reorder to improve gui workflow

Loading
Loading