Fixed Issues with Layouts Assignment Validation