Moving some indicators around to fall into the appropriate categories