Attempting to fix layouts.