improve state labels