GUI update
Merge resolved