Refactored into using immersive card design