fix bug master + added Performance Improvement
Fix Invoice
fix missing popup