Version 2.0: Add layout system.
Merge remote-tracking branch 'remotes/github/master'