Re-order left nav and make labels consistent with arvados vocabulary.