use layout Martini feature

Fixes #2