Reorganized the main window.
Tweaks.