More layout corrections