Split and add navigation specs