UI fixed and some stuff
Merge branch 'master' of https://github.com/elferrus7/mrpg