layout changes, fixes #7