fix breaking l2 and show layouts