Fixing crashed layout
Fixing crashed layout 2