PageBuilder flow more sensible