rest of changes for design and fixes