Review layout

Fixes #21