layout: Address review feedback.