Update from latest master version, minor GUI changes