Modified design, and navigation, refactoring