Some ui/rounding improvements