Completed layouts for classes

Not tested in mouse, passed debug