Many improvements

* Bug fix for duplicate messages
* Changed some appearance
Merge branch 'master' of github.com:adaedra/pfa-idea3