layout fix, config changes, unused popup view removed, ...