Refactor MarkerPicker and fragment navigation