closes #585

A little tricky since the wireframes are in the old design and most of the site is in the new design, but I think this should work for now