Current state page improved