PM: reorganise layouts