Improved Data Window layout.