Tweaked layout check