Improve the state column displaying