some layout improvements