Better layouts. Fixes #110