foctorize code
improve charts sub menu
Merge pull request #33 from openjaf/develop

Develop