Merge branch 'Dustin'
Summary deleting, nav state change, other small fixes
Merge branch 'master' into Dustin