fixed more page current state