Some more work on Activity based navigation