Changes in classes and layouts.