Added Abililty to change unit of measurement as well as major styling change