Minor GUI fixes and changes
Merge branch 'Niels' into develop