Typos in logs
Add necessary layouts for matrix choice
Add background classes for matrix choice