More layout corrections.