design aditions
Merge pull request #134 from SergioCrisostomo/design-fixes

design aditions