Bug 988486 - Re-organize Zone to save some space and increase readability; r=jonco