new layout, fixes #12, fixes #9