Bug 920722 - Change the layout to avoid overlapping
Merge pull request #12850 from crh0716/920722

Bug 920722 - Change the layout to avoid overlapping r=evelyn