Fixing layout IDs