Revert 283dc37..8ca660f

This rolls back to commit 283dc37a5b68a3b4ba5635a7d2a4ee09875708ee.
Fixed stupidity _layout