Update with latest version from master, mostly GUI changes