Frame size edits as discussed at the interim

As discussed in the interim... (I had previously submitted this in a batch against the Layering branch... redoing against the Master)