Redone Factory 10 layout