More UI changes, better lb/kg supportr