Fixed more layouts.