some layout corrections