Intro page refactor