Updated program

All data locations and calculations fixed
All data tables added
All data tables collapsible