Updated linux build.
Updated layout file.
Reordered comments.