Make status indicators state clearer