Added layout space
Revert "Added layout space"

This reverts commit c5aa2c57668e82dea1b1e98fa4e7b78817135759.
Revert "Revert "Added layout space""

This reverts commit 5026e8279243882421cffcb2996c34b8e2fc712f.
Minor fixes