Moved components loading back to UI