Display basic bar chart
Enahnce layout
Merge branch 'layout' into develop
Resolve merge conflicts