Merge pull request #6 from alfeko/UI

Ui