UI part II
Merge branch 'master' of https://github.com/prokopyl/NyanChat