added generic attribute set. some ui layout changes. ID-218