Added List Component and other changes