More code changes for responsive design
Wipe matches support