[bug 846026] Adding more style/layout changes.