More refactoring: all layout IDs match in style