Clean up welcome scaffold; Fix up Plan Log