New spec, refactor components with this spec https://app.zeplin.io/project.html#pid=58db32a7ad38bc61782a4af1&dashboard