Moved Width, WidthUnits, Height, and HeightUnits into a new Dimension class and updated throughout; general code cleanup