Added a few layout, charts etc