Layouts fixed, invalid ids fixed