fix layout name and generation