Significant updates to GUI functionality
Merge