Component placement, fixed some modules