Reworked some of the selectors so less of the logic was in the rendering modules and so that repeated logic was in selectors.