ui, bugs
Merge branch 'master' of https://github.com/ionuts1704/yatm