Rounding values and few UI fixes