Merge the redeign branch into master, as the redesign is now live

This will not address all problems, and might even create some, but this is a work in progress that I hope to finish today. This should address some failures.