Nav from tab selection to new activity; cleaned up code