bug 925970

* Final round of alignment changes. Unfortunately no time for anymore. It's as good as it's going to get for 1.2 and 1.3.

r=peterla