Minor code correction.
Further improvements in default layout.