refined typography, color choices, minor layout
manual merge