Modularize navigation components