Added missing changes after layout move.