Fixing indents to follow ZPanelX standards.

Also changed the order to match 10.1.1 structure.