Improves UI a little bit
Resolves merge conflict in columnchart.js