Initial dist subtree commit
Update main layout