CON-706 Ordering properties, fixing spacing