Properly fix layout switching

tiling also needs to have the type declared, because that's used to find the index.

Otherwise it'll switch once from the default and then never again.