Refactor things

This splits the logic out a bit better to handle the two layouts: the one for hard-core focus group testing and the one that doesn't make people feel like they are in a focus group.