Refactor TwoColumnsLayout with bootstrap columns
Optimize chart margins