Delaying layout once again

Probably fixes #61
Probably fixes #32