GUI fixes
Merge branch 'padillbt'