Style refactoring and navigation tweaks