Fix on dashboard, refactor on formatter