Fixed version of layouts. Still working on spell name