CORE-5762: Corrected layout for Tree item editor
CORE-5762: Reformat and rem explicit type settings
This is for Java 7 type inference
CORE-5762: Slight re-order of code-behind