Rework the Intro and Setup Sections