Minor changes

Mostly design
Minor changes

Changed a few minor things like how the table initially is created