Revert "Revert "changes in layout""

This reverts commit f4ec73d0be2f340caa230619c3e6833b9ca837ce.