Improvements on the state page