First commit with all of changes in layouts.