Refactoring & add sales widgets