UI
Merge pull request #91 from SSD-ESIEA/userData

UI
Merge pull request #92 from SSD-ESIEA/dev

Dev