[OTLayout] Move code around
2 files changed