Added better per post navigation support