Facility GUI improvements & bug fixing

- Jonas
Merge origin/master