fix set sent
fixes in ux
Merge pull request #110 from matiu/feature/ux10

Feature/ux10