Updated components to current list and descriptions