Optimisation
Code improvement
Ui improvement
Merge origin/master
Merge pull request #169 from zoic21/master

Merge from master