Fix and improve Layout specs