Add navigation buttons
Enhance navigation