Adding evaluation method parameters and changing layout.