Merge pull request #155 from SmokyBob/feature/material_design

Merge fixes for Issue #154 and #146
fixed the order of the column displayed in the chart table
reinitialize the array displayed in the edit table to avoid record duplication