Fix integration nav custom

Commits @DLu  changes and the fixes for the vetex_driver issues