Linked new layout and added logging details.
Linked new layout.
Code cleanup.