updated order of default components