Fix conflicts (layout break) as hotfix (update later using GTT)