New design
Add loop and close button