[bug 846026] Adding more style/layout changes.

See comments on [bug 846026](https://bugzilla.mozilla.org/show_bug.cgi?id=846026#c8) for reference on requested changes.