Refactor form layouts. See my next push into atk4/docs