Merge "Fix layout issues"