CT-6296: Added Modal module

E2E tests should be passing again now