added typography, continuing to organize and refactor
merge conflicts