UI stuff
Merge branch 'master' of https://github.com/maxi-jp/Project_NewDetroit