* New option to choose graphic type
* Small adjustments