improved back navigation. still not perfect