Use new cleaner layouts