Fixed formatting,added state and blocked indicators