Merge pull request #589 from gsn/test

Merged from Test.
Update layout.
Removing inactive chains.
Merge pull request #591 from gsn/master

Merged from master.