some refactoring and UI work
Merge branch 'master' of https://github.com/wokemx/pepa