Fix order of navigate back home