Add to layout doc
Delint and prepare for rebase