More UI modifications
Merge branch 'new_attempt' of github.com:mcepl/elasmotherium into new_attempt