Updated validation and navigation.