added bg-color to some components
Merge remote-tracking branch 'origin/master'