Changed state layout according to suggestion in issue 197.