Fixing mis-named variables
Fixing lint error and mis-named variable
Adding global box-sizing to base file