SCAL-160: better organization of navigation links