RW: some layout changes