Changed Layout library
Corrected conflicts