agree, we probably would be best fixing this with an upstream PR so to allow other layouts, I know there is a ticket but just didn't want to loose focus.