Changes to design and tiny fixes
Tiny changes