Again, maybe look for a way to remove the duplication in these views?