Code and UI clean up
Merge branch 'master' of https://github.com/dczupek/Mai-Ige