- Fix number formatting bug;
- Fix theming bug;
- Refactoring