Refactor navigation in snapshot view