Move charts to helper, add split chart