Try to fix some errors.
Move select-navigation to top.