Layout script declaration tweaks