more work + navigation updates