Navigation re-arrange on Index