better fitting attributes, repositioning of some controls