Also fix alignment where necessary

Submitted by Eelco Visser on 27 March 2014 at 13:39