improve module layout