Changed layout and added comments.
Authored by: jwjoubert 2014-11-03
Parent: [r30892]
Child: [r30894]