fac GUI fixes
- Jonas
Merge origin/master