Improving layout table criterias
Thanks to @olamedia in #74, I was able to make those criterias a lot more explicits.