removing all instances of calc and restructuring javascript to make the ...

...animation work (still a little janky)