Style tweaks and adding summary/links slide
Resolving merge conflicts