[gpvos]

One solution might be to keep supporting the previous two or three layouts, and provide an easy way to switch back and forward between them.