Fixed navigation flow. Refactored class names.