Minor refactoring of fragment/navigation functionality