Refined push & popstate