Merge gui branch