Bug fixes/refactoring cell selection/navigation.