Wrap nav menu in block for easier customization

Wrap nav menu in block for easier customization