Wrap up 'Why SPA' and refactor make up section