Changed UI a little, removed trailing zeros