Fix up rendering of states pieces