refactored layout for per-env settings