layout (fixes #1)

please merge!