fix(Layout): optimize support layout

Closes: #CAM-1416