UI update
Merge branch 'master' of github.com:corytheboyd/nikomu