Enabled two more laypouts
Fixed some files. [skip ci]