Basic GUI changes
Merge branch 'GUI' into dev-feature-controllers