Added color to the bars
a few changes regarding the bars
fixed conflicts