Layout adjustments

In prep for RFQ screens.