More config, updated menu