Layout/73

This PR depends on #74 (diff may seem too large)

A PR fixing #73