Begin rearrangement of layout to simplify HTML
Moving over to SASS