Manual merge in some styling from coming-soon branch