Improved refreshing and state management
tweak timing of page examination