Dev/gui bug fixes

Merged Benedikt Zoennchen requested to merge dev/gui-bug-fixes into develop

Merge request reports