ADD: Cleanup to some layouts.