more layout work, miglayout-fication