Changes for layout tasks

Changes for layout tasks