Merge pull request #103 from luixxiul/ui

Ui
Merge pull request #104 from luixxiul/development

Development