Moving canvas charts into its own file and adding some changes to the layout