Fixed command width/padding issues