Added padding again.. there is probably a more elegant way to do this..