GUI update
Merge