Layout indicator

Fixes #39