More layout changes, try and correct spacing.