Merge pull request #1 from Lifespark/master

Merge root changes to design