Remove unnecessary code to speed up page reload
Speed improvements and remove redundant code
Completes table-heads