Revised layout of UOM & UOM Factor. Issue #22 & #23