Updated styling and the mocks in preperation for CAP-77