Refactor navigation
Set name limits