SAT-349 Question/new layout update