simplified ui
updates

Merge branch 'master' of https://github.com/conru/painter