Index components properly