Remove unnecessary code to speed up page reload
Speed improvements and remove redundant code
Completes table-heads
Merge pull request #533 from timschofield/develop

Develop