More re-laying out of the panel