Updated templates to show both models