Added points to layout.
Merging changes.