FIX: add missing layouts