fix the layouts.