Major change to the env var and services UI + various fixes