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

https://bugzilla.mozilla.org/show_bug.cgi?id=920722