removed possibly all hardcoding on graphs, drawing bars and data points implemented