Converted all remaining code to common layouts.