Merge "Fixing crash and updating default layout"