titles as links
resolving conflicts
cc redesign changes to layout
returns upload button to previous layout.