GUI changes
Fixes