Fixed submissions chart. refactoring