Layout Changes
Improved layouts on swing windows.