Control the component display better

Sort by component number, and expand the limit.