[bug 935001] Fixed spacing and alignment