bunch of updates to affiliates, remove links, layout stuff, etc