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

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

Dev