some layout cleanup