apply some improved layout patterns. fixes #55