Added more toggling of indicators.