OZP-56: Migrate accordion layouts.

1. Implementing code review changes.