make the app more nice and working
Merge branch 'purbon-master'